projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
685b547
)
(font_for_char): Use assq_no_quit, not assoc_no_quit.
author
Kenichi Handa
<handa@m17n.org>
Wed, 28 Jan 2009 06:45:07 +0000
(06:45 +0000)
committer
Kenichi Handa
<handa@m17n.org>
Wed, 28 Jan 2009 06:45:07 +0000
(06:45 +0000)
src/ChangeLog
patch
|
blob
|
history
src/fontset.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 050b0c20efe0ae119fe51d591de5ca7aeb008b8e..9b359f166c3cbab58886ae39181545acbab11222 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,7
@@
+2009-01-28 Kenichi Handa <handa@m17n.org>
+
+ * fontset.c (font_for_char): Use assq_no_quit, not assoc_no_quit.
+
2009-01-27 Chong Yidong <cyd@stupidchicken.com>
* fns.c (concat): Check for string overflow (bug#1787).
diff --git
a/src/fontset.c
b/src/fontset.c
index 2eabef8cfc0ed260b2d98a1fab6ff1b3110bc05d..b69c650c7c5aa3dd402f09572154415e14afdad5 100644
(file)
--- a/
src/fontset.c
+++ b/
src/fontset.c
@@
-970,7
+970,7
@@
font_for_char (face, c, pos, object)
{
Lisp_Object val;
- val = ass
oc
_no_quit (charset, Vfont_encoding_charset_alist);
+ val = ass
q
_no_quit (charset, Vfont_encoding_charset_alist);
if (CONSP (val) && CHARSETP (XCDR (val)))
charset = XCDR (val);
id = XINT (CHARSET_SYMBOL_ID (charset));